Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(TimePicker): use 12 hours, disable hour not add 12, check meridiem only support en #3326

Merged
merged 10 commits into from
Sep 24, 2024

Conversation

myronliu347
Copy link
Contributor

@myronliu347 myronliu347 commented Sep 17, 2024

🤔 这个 PR 的性质是?

  • 日常 bug 修复
  • 新特性提交
  • 文档改进
  • 演示代码改进
  • 组件样式/交互改进
  • CI/CD 改进
  • 重构
  • 代码风格优化
  • 测试用例
  • 分支合并
  • 其他

🔗 相关 Issue

💡 需求背景和解决方案

修复 12小时制情况下的问题:

  1. diableTime hour 传参没有 +12
  2. 判断 === 'PM', dayjs locale切换成中文就失效了

📝 更新日志

  • fix(TimePicker): 修复12小时制切换在dayjs切换中文情况下失效的问题

  • 本条 PR 不需要纳入 Changelog

☑️ 请求合并前的自查清单

⚠️ 请自检并全部勾选全部选项⚠️

  • 文档已补充或无须补充
  • 代码演示已提供或无须提供
  • TypeScript 定义已补充或无须补充
  • Changelog 已提供或无须提供

Copy link
Contributor

完成

@myronliu347 myronliu347 changed the title Feat time picker fix(TimePicker): use 12 hours, disable hour not add 12, check meridiem only support en Sep 17, 2024
@myronliu347
Copy link
Contributor Author

这个bug fix 麻烦看一下

@myronliu347
Copy link
Contributor Author

另外dayjs 解析12 小时值的时间会有bug '中午 12:00:00' 这个解析之后回事00:00:00 导致异常,这个目前只能在本地重写 dayjs customParseFormat 插件解决这个问题,
看了下 ant design 使用value 就是dayjs 类型,没有解析字符串的操作,绕过了这个问题

@uyarn
Copy link
Collaborator

uyarn commented Sep 24, 2024

另外dayjs 解析12 小时值的时间会有bug '中午 12:00:00' 这个解析之后回事00:00:00 导致异常,这个目前只能在本地重写 dayjs customParseFormat 插件解决这个问题, 看了下 ant design 使用value 就是dayjs 类型,没有解析字符串的操作,绕过了这个问题

image 这个情况下?

@uyarn uyarn merged commit 672f02c into Tencent:develop Sep 24, 2024
6 checks passed
@myronliu347
Copy link
Contributor Author

dayjs 需要locale 设置成 'zh-cn'

@github-actions github-actions bot mentioned this pull request Sep 24, 2024
16 tasks
uyarn pushed a commit that referenced this pull request Sep 24, 2024
…m only support en (#3326)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* fix(TimePicker): use 12 hours, disable hour not add 12, check meridiem only support en
uyarn added a commit that referenced this pull request Sep 24, 2024
* chore: replace type alias path to relative path (#3297)

* fix(Select): fix keyboard event conflict with self-defined components (#3303)

* chore: optimize (#3304)

* fix(Select): support checkAll option when using filterable API (#3295)

* perf(select): 全选常驻

* perf(select): 选择器搜索时支持全选选项常驻

* chore(select): 支持搜索词保留

* feat(menu): support multiple head menu (#3296)

* feat(menu): support multiple head menu

* feat(menu): lint multiple head menu code

* fix(menu): update snap files

* fix(menu): fix code style

* chore: complete classprefix docs (#3306)

* fix(input): fix status default value (#3307)

* chore(deps-dev): bump jsdom from 20.0.3 to 25.0.0 (#3300)

* chore(deps-dev): bump jsdom from 20.0.3 to 25.0.0

Bumps [jsdom](https://github.com/jsdom/jsdom) from 20.0.3 to 25.0.0.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/main/Changelog.md)
- [Commits](jsdom/jsdom@20.0.3...25.0.0)

---
updated-dependencies:
- dependency-name: jsdom
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* chore: update snapshot

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* fix(upload): uploadPastedFiles =false 时第一次上传文件后会报错,导致整个vue 响应式丢失 (#3308)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* feat(tag): support title api (#3309)

* feat(tag): support title api

* fix: test case

* fix: test case

* chore: fix test

* chore: update snapshot

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* feat(form): support form id and button form API (#3310)

* feat: date-picker and time-picker support readonly API (#3311)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* feat(DatePicker): support readonly

* feat(TimePicker): support readonly

* chore: update snapshot

* docs: add readonly in api

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: update pr-comment-ci (#3312)

* chore: update pr-comment-ci

* chore: add generate:coverage-badge

* feat(site): component Internationalization (#3316)

* feat(site): component Internationalization

* chore: remove`data` defined

* docs(icon): fix installation instructions (#3318)

* [Bug Fix]:修复表格开启虚拟滚动和loading 后,分页和表格内容顺序错乱的问题 (#3319)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* fix(Table): virtual scroll pagination content order error

* fix(tree-select): keys should support deep keys (#3313)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* fix(Treeselect): suport deep keys like entiry.label

* chore: change lodash import

* fix(Slider): fix change-end emit and support empty array as initial value  (#3320)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* fix(Slider): change end event not emit

* fix(Slider): range mode not use on value is empty array

* feat(TimeRangePicker): auto open others panel, auto set start end value order (#3327)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* feat(TimeRangePicker): auto open others panel, auto set start end value order

* fix(TreeSelect): mulitple set true has empty selection tag (#3328)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* fix(TreeSelect): mulitple set true has empty selection tag

* chore: update test snap

* style: code style fixed

* fix(tree-select): fix multiple select click parent node callback (#3330)

* feat: checkboxGroup/select/List support change component tag name (#3322)

* feat(table): add class to identify expanded and folded row  (#3331)

* feat(table): add class to identify expanded and folded row when expandRowKeys is defined

* chore: update snapshot

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* feat(cascader): support scroll to first selected node (#3335)

* feat(cascader): support scroll to first select node

* chore: fix lint

* feat(i18n): add ru_RU and  it_IT (#3334)

* fix(DatePicker): fix boundary week format bug (#3336)

* docs: fix datepicker week firstdayofweek usage demo

* fix(DatePicker): fix week calculate bug

* fat(upload): uploader trigger context add disabled (#3321)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* feat(Upload): trigger context add disabled

* fix(TimePicker): use 12 hours, disable hour not add 12, check meridiem only support en (#3326)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* fix(TimePicker): use 12 hours, disable hour not add 12, check meridiem only support en

* fix(cascader): fix filterable parent click bug (#3333)

* feat(Rate): add clearable prop (#3332)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* feat(Rate): add allowClear Prop

* chore: update test snap

* chore: change prop name clearable

* chore: clearable result should be 0

* chore: clearable result should be 0

---------

Co-authored-by: wū yāng <[email protected]>

* fix(SelectInput): overlay width not update on width change (#3325)

* fix(TimePicker): fixed only support hh:mm format

* fix(TimePicker): disabled position only is  start

* fix(Upload): fixed vue error on uploadPastedFiles is false

* docs: add readonly in api

* fix(SelectInput): overlay width not update on width change

* chore: release 1.10.1 (#3337)

* chore: release 1.10.1

* chore: fix cascader change bug

* chore: changelog's changes

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* chore: release 1.10.1-naruto

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: 企鹅岛岛主 <[email protected]>
Co-authored-by: setcy <[email protected]>
Co-authored-by: liweijie0812 <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: myron <[email protected]>
Co-authored-by: 阿菜 Cai <[email protected]>
Co-authored-by: 阿菜 Cai <[email protected]>
@github-actions github-actions bot mentioned this pull request Sep 24, 2024
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants